Merge branch 'master' of git://git.denx.de/u-boot
authorKim Phillips <[email protected]>
Mon, 4 Feb 2013 17:16:26 +0000 (11:16 -0600)
committerKim Phillips <[email protected]>
Mon, 4 Feb 2013 17:16:26 +0000 (11:16 -0600)

Trivial merge